From ac5ea23a6db5931a0a6c99734e79fae82bff3908 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Thu, 30 Nov 2006 17:28:51 +0000 Subject: [PATCH] Reinstate the reboot-feature code that was accidentally lost as part of the merge in changeset 12189. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/image.py | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 98397d76ca..afff1b084e 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -280,6 +280,7 @@ class HVMImageHandler(ImageHandler): log.debug("apic = %d", self.apic) self.register_shutdown_watch() + self.register_reboot_feature_watch() return xc.hvm_build(domid = self.vm.getDomid(), image = self.kernel, @@ -420,6 +421,7 @@ class HVMImageHandler(ImageHandler): def destroy(self): self.unregister_shutdown_watch() + self.unregister_reboot_feature_watch(); if not self.pid: return try: @@ -470,6 +472,39 @@ class HVMImageHandler(ImageHandler): return 1 # Keep watching + def register_reboot_feature_watch(self): + """ add xen store watch on control/feature-reboot """ + self.rebootFeatureWatch = xswatch(self.vm.dompath + "/control/feature-reboot", \ + self.hvm_reboot_feature) + log.debug("hvm reboot feature watch registered") + + def unregister_reboot_feature_watch(self): + """Remove the watch on the control/feature-reboot, if any. Nothrow + guarantee.""" + + try: + if self.rebootFeatureWatch: + self.rebootFeatureWatch.unwatch() + except: + log.exception("Unwatching hvm reboot feature watch failed.") + self.rebootFeatureWatch = None + log.debug("hvm reboot feature watch unregistered") + + def hvm_reboot_feature(self, _): + """ watch call back on node control/feature-reboot, + if node changed, this function will be called + """ + xd = xen.xend.XendDomain.instance() + vm = xd.domain_lookup( self.vm.getDomid() ) + + status = vm.readDom('control/feature-reboot') + log.debug("hvm_reboot_feature fired, module status=%s", status) + if status == '1': + self.unregister_shutdown_watch() + + return 1 # Keep watching + + class IA64_HVM_ImageHandler(HVMImageHandler): ostype = "hvm" -- 2.30.2